Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sun, 25 Apr 2010 13:11:29 +0000 (13:11 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sun, 25 Apr 2010 13:11:29 +0000 (13:11 +0000)

Trivial merge